Skip to content

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 22, 2020

Successful merges:

Failed merges:

r? @ghost

eddyb and others added 30 commits March 20, 2020 08:00
As discussed in rust-lang#67939, this allows turning Option<ThreadId> into Option<NonZeroU64> which
can then be stored inside an AtomicU64.
Also remove ExtCtxt::struct_span_fatal.
jplatte and others added 14 commits March 21, 2020 23:33
Expand: nix all fatal errors

Basically, we go after all `.span_fatal` / `FatalError.raise()` and similar things and remove them one by one until there are no fatal errors left.

r? @petrochenkov
…trochenkov

parse/lexer: support `StringReader::retokenize` called on external files.

This ~~should theoretically~~ fixes rust-lang#69933, ~~but I'm not sure what the best way to test it is~~.
**EDIT**: see rust-lang#69933 (comment).

r? @petrochenkov cc @Xanewok @staktrace
…trochenkov

parser: recover on `for<'a> |...| body` closures

When encountering `for` and `<` is 1 token ahead, interpret this as an explicitly quantified generic closure and recover, rather than attempting to parse a `for` loop. This provides both improved diagnostics as well as an insurance policy for the ability to use this as the syntax for generic closures in the future.

As requested by r? @eddyb
fix type of const params in associated types.

fixes rust-lang#66906
fixes rust-lang#70167

r? @eddyb
Only display definition when suggesting a typo

Closes rust-lang#70206
r? @Centril
more clippy fixes

* remove unused unit values (clippy::unused_unit)
* make some let-if-bindings more idiomatic (clippy::useless_let_if_seq)
* clarify when we pass () to functions (clippy::unit_arg)
* don't redundantly repeat field names (clippy::redundant_field_names)
* remove redundant returns (clippy::needless_return)
* use let instead of match for matches with single bindings (clippy::match_single_binding)
* don't convert results to options just for matching (clippy::if_let_some_result)
Return NonZeroU64 from ThreadId::as_u64.

As discussed in rust-lang#67939, this allows turning Option<ThreadId> into Option<NonZeroU64> which
can then be stored inside an AtomicU64.
Remove wrong entry from RELEASES.md

resolves rust-lang#70247
Remove another wrong entry from RELEASES.md

The entry is under 1.11.0, but the feature is only available since 1.12.0 (for which an identical entry exists).

![Screenshot_2020-03-22 Support `cfg_attr` on `path` attributes by jseyfried · Pull Request rust-lang#34546 · rust-lang rust](https://user-images.githubusercontent.com/951129/77238862-85c8f580-6bd4-11ea-8d31-77e2994a4b5a.png)
couple more clippy fixes (let_and_return, if_same_then_else)

* summarize if-else-code with identical blocks (clippy::if_same_then_else)
* don't create variable bindings just to return the bound value immediately (clippy::let_and_return)
@Centril Centril added the rollup A PR which is a rollup label Mar 22, 2020
@Centril
Copy link
Contributor Author

Centril commented Mar 22, 2020

@bors r+ p=10 rollup=never

@bors
Copy link
Collaborator

bors commented Mar 22, 2020

📌 Commit 688d655 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 22, 2020
@bors
Copy link
Collaborator

bors commented Mar 22, 2020

⌛ Testing commit 688d655 with merge 48a5fe5d03499c164e2313b9fec11240ee73c8dc...

@bors
Copy link
Collaborator

bors commented Mar 22, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 22, 2020
@Centril Centril deleted the rollup-d1tw8bp branch March 22, 2020 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants